Bug 541315 – Segfault when selecting a GtkMenuItem with submenu and no

2008-08-18  Björn Lindqvist  <bjourne@gmail.com>

	Bug 541315 – Segfault when selecting a GtkMenuItem with submenu
	and no parent

	* gtk/gtkmenuitem.c (gtk_menu_item_real_popup_submenu): Ensure
	that the menu item has a parent before popping it up.

svn path=/trunk/; revision=21149

diff --git a/ChangeLog b/ChangeLog
index c32ab33a952354257f0f403b33ee5078aa4ffdeb..eb1967da286ceb049221ca572598431bc30206a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-18  Björn Lindqvist  <bjourne@gmail.com>
+
+       Bug 541315 – Segfault when selecting a GtkMenuItem with submenu
+       and no parent
+
+       * gtk/gtkmenuitem.c (gtk_menu_item_real_popup_submenu): Ensure
+       that the menu item has a parent before popping it up.
+
 2008-08-18  Johan Dahlin  <johan@gnome.org>
 
        Bug 548196 – gtk-builder-convert doesn't properly convert GtkTextView

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index a7256af1134d730d43493e1f9bf43a4298d6f0d6..b8fae7614916039182e886e9e1c680c21cc2afc1 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -1137,7 +1137,7 @@ gtk_menu_item_real_popup_submenu (GtkWidget *widget,
 {
   GtkMenuItem *menu_item = GTK_MENU_ITEM (widget);
 
-  if (GTK_WIDGET_IS_SENSITIVE (menu_item->submenu))
+  if (GTK_WIDGET_IS_SENSITIVE (menu_item->submenu) && widget->parent)
     {
       gboolean take_focus;
       GtkMenuPositionFunc menu_position_func;